[Wallet] move wallet help string creation to CWallet #7576
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
ACK (please fix the typo). |
|
Nice, utACK. |
|
Looks good. utACK acf7f87 |
| @@ -55,6 +55,8 @@ static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2; | |||
| static const unsigned int MAX_FREE_TRANSACTION_CREATE_SIZE = 1000; | |||
| static const bool DEFAULT_WALLETBROADCAST = true; | |||
|
|
|||
| static const char * const DEFAULT_WALLET_DAT = "wallet.dat"; | |||
There was a problem hiding this comment.
Better not to put string constants in header files. This causes problems, such as duplication - either undetected and wasting space in the executable, or explicit linker duplication errors.
Better to make it "extern const char*" and define the value in the implementation file.
|
utACK apart from nit - great idea. |
|
Concept ACK, but fix @laanwj's nit and the typo. |
| @@ -869,6 +871,9 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface | |||
|
|
|||
| /* Mark a transaction (and it in-wallet descendants) as abandoned so its inputs may be respent. */ | |||
| bool AbandonTransaction(const uint256& hashTx); | |||
|
|
|||
| /* Retruns the wallets help message */ | |||
There was a problem hiding this comment.
@jonasschnelli Please address the feedback so this can be merged next week.
There was a problem hiding this comment.
Yes. Will fix is in the next coupl of hours. Thanks for the reminder.
jonasschnelli
force-pushed
the
2016/02/wallet_helpstr
branch
from
acf7f87
to
a1ffcb3
Compare
jonasschnelli
force-pushed
the
2016/02/wallet_helpstr
branch
from
a1ffcb3
to
72c2651
Compare
|
Fixed nit (amend force push) |
|
utACK 72c2651 |
laanwj
added a commit
that referenced
this pull request
Mar 11, 2016
72c2651 [Wallet] move wallet help string creation to CWallet (Jonas Schnelli)
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Dec 19, 2017
72c2651 [Wallet] move wallet help string creation to CWallet (Jonas Schnelli)
zkbot
added a commit
to zcash/zcash
that referenced
this pull request
Dec 18, 2019
Bitcoin wallet PRs 2 Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#7576 - bitcoin/bitcoin#7577 - bitcoin/bitcoin#7608 - bitcoin/bitcoin#7691 - bitcoin/bitcoin#7905
random-zebra
added a commit
to PIVX-Project/PIVX
that referenced
this pull request
Aug 25, 2020
7e71759 Wallet: Split main logic from InitLoadWallet into CreateWalletFromFile (random-zebra) e585dad [Wallet] refactor wallet/init interaction (random-zebra) 49646b2 [Refactor] Nuke zwalletMain global object (random-zebra) f5f9df9 Wallet: Let the interval-flushing thread figure out the filename (Luke Dashjr) 74445e4 [wallet] Move hardcoded file name out of log messages (random-zebra) 3f1838d [Wallet] optimize return value of InitLoadWallet() (random-zebra) 539dea4 [Wallet] move "load wallet phase" to CWallet (random-zebra) 7644318 [Wallet] move wallet help string creation to CWallet (random-zebra) a9d69b8 [trivial] Reuse translation and cleanup DEFAULT_* values (random-zebra) cfd007a [Bug] Omit wallet-related options from -help when wallet not supported (random-zebra) da642e6 [Refactor] More constant default values cleanup (random-zebra) a45275a [Refactor] Implement CBaseChainParams::BaseParams(Network) (random-zebra) 09abb98 Constrain constant values to a single location in code (random-zebra) Pull request description: Adapts the following refactoring PRs: - bitcoin#6961 Constrain constant values to a single location in code - bitcoin#7576 [Wallet] move wallet help string creation to CWallet - bitcoin#7577 move "load wallet phase" to CWallet - bitcoin#7608 Move hardcoded file name out of log messages - bitcoin#7691 refactor wallet/init interaction - bitcoin#8776 Wallet refactoring leading up to multiwallet ACKs for top commit: furszy: re ACK 7e71759 Fuzzbawls: ACK 7e71759 Tree-SHA512: 5fad328b9ddf8187af97d3d5fb285d0b67e73d51ac1bc44a3d57d0af86bce8b34efaab539b7bdbc4f9a2fa575a936f83788cffcc9c6d6d04cd3e63b19d399400
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Simple and easy-to-review refactoring to reduce wallets init.cpp polution and sets another step in the wallet separation / duplication.
The only visible change to users would be, that the wallet help message part has now it's own
-help-debugpart (IMO desirable if we look at the wallet as it is a module)